(compose_text): Don't treat the new style

composition specially.

diff --git a/src/composite.c b/src/composite.c
index 8e6a8e3b88bf762d7e805d57e31cde12722a4732..a8317968cae5581c12b69c559299adc4a10aff36 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -652,6 +652,12 @@ compose_text (start, end, components, modification_func, string)
 {
   Lisp_Object prop;
 
+#if 0
+  if (VECTORP (components) && ASIZE (components) > 1
+      && VECTORP (AREF (components, 0)))
+    prop = components;
+  else
+#endif /* USE_FONT_BACKEND */
   prop = Fcons (Fcons (make_number (end - start), components),
                modification_func);
   Fput_text_property  (make_number (start), make_number (end),